From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 21 Jan 2013 15:27:50 +0000 (+0000)
Subject: php5-pecl-libevent: fix build after r32918
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=38a9b2ab83da9f568f85b1403c13409dc388873d;p=openwrt%2Fsvn-archive%2Fpackages.git

php5-pecl-libevent: fix build after r32918

The mentioned changeset moved libevent header and library to a specific
subdirectory, so we have to give this pecl module a hint where to look
for its required stuff now.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 35279
---

diff --git a/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch b/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch
new file mode 100644
index 000000000..aef038e01
--- /dev/null
+++ b/lang/php5-pecl-libevent/patches/100-openwrt-libevent-include.patch
@@ -0,0 +1,20 @@
+--- a/config.m4
++++ b/config.m4
+@@ -5,7 +5,7 @@ PHP_ARG_WITH(libevent, for libevent supp
+ 
+ if test "$PHP_LIBEVENT" != "no"; then
+   SEARCH_PATH="/usr /usr/local"
+-  SEARCH_FOR="/include/event.h"
++  SEARCH_FOR="/include/libevent/event.h"
+ 
+   if test "$PHP_LIBEVENT" = "yes"; then
+     AC_MSG_CHECKING([for libevent headers in default path])
+@@ -28,7 +28,7 @@ if test "$PHP_LIBEVENT" != "no"; then
+     AC_MSG_ERROR([Cannot find libevent headers])
+   fi
+ 
+-  PHP_ADD_INCLUDE($LIBEVENT_DIR/include)
++  PHP_ADD_INCLUDE($LIBEVENT_DIR/include/libevent)
+ 
+   LIBNAME=event
+   LIBSYMBOL=event_base_new
diff --git a/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch b/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch
new file mode 100644
index 000000000..e6c283521
--- /dev/null
+++ b/lang/php5-pecl-libevent/patches/101-openwrt-libevent-libdir.patch
@@ -0,0 +1,13 @@
+--- a/config.m4
++++ b/config.m4
+@@ -33,9 +33,7 @@ if test "$PHP_LIBEVENT" != "no"; then
+   LIBNAME=event
+   LIBSYMBOL=event_base_new
+ 
+-  if test "x$PHP_LIBDIR" = "x"; then
+-    PHP_LIBDIR=lib
+-  fi
++  PHP_LIBDIR=lib/libevent
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+   [